cast the return value of _gdk_pixbuf_scaled_anim_new() to fix incompatible

2008-01-14  Michael Natterer  <mitch@imendio.com>

	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_prepare): cast the return
	value of _gdk_pixbuf_scaled_anim_new() to fix incompatible pointer
	warning.

svn path=/trunk/; revision=19364

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 0c3da6bfe2c3e82df24a4e3ead661c66c8563d75..560eeff38c1c5c2fa8d6dc174fbe4b0dc041e579 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-14  Michael Natterer  <mitch@imendio.com>
+
+       * gdk-pixbuf-loader.c (gdk_pixbuf_loader_prepare): cast the return
+       value of _gdk_pixbuf_scaled_anim_new() to fix incompatible pointer
+       warning.
+
 2007-12-09  Matthias Clasen  <mclasen@redhat.com>
 
        * io-jpeg.c: Fix the spinguard logic for big buffers.

diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index 981874c08558d931c88859dbcd11e7f994e2ea4d..cb167ddd42311b38b58dd1348620e0feaf2975e5 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -279,10 +279,10 @@ gdk_pixbuf_loader_prepare (GdkPixbuf          *pixbuf,
                 anim = gdk_pixbuf_non_anim_new (pixbuf);
   
        if (priv->needs_scale) {
-               priv->animation  = _gdk_pixbuf_scaled_anim_new (anim,   
+               priv->animation  = GDK_PIXBUF_ANIMATION (_gdk_pixbuf_scaled_anim_new (anim,
                                          (double) priv->width / gdk_pixbuf_get_width (pixbuf),
                                          (double) priv->height / gdk_pixbuf_get_height (pixbuf),
-                                         1.0);
+                                         1.0));
                        g_object_unref (anim);
        }
        else